PLA-217 intendation changes