merge 5.3.x. Too many levels of if nesting
Comment From: pivotal-cla
@Arjen10 Please sign the Contributor License Agreement!
Click here to manually synchronize the status of this Pull Request.
See the FAQ for frequently asked questions.
Comment From: pivotal-cla
@Arjen10 Thank you for signing the Contributor License Agreement!