Plfm 2920 port

Port from changes in develop